From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Mon, 2 Dec 2019 15:36:38 +0000 (-0300)
Subject: screenShield: Cleanup _ensureUnlockDialog
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~109
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fd484099ae3189310eb1a10d4a1b0cbb336a54b3;p=gnome-shell.git

screenShield: Cleanup _ensureUnlockDialog

Just like on ScreenShield.activate(), we can just ensure the
unlock screen on ScreenShield.showDialog().

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/872
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 4cb7f249d..18352e554 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -328,8 +328,7 @@ var ScreenShield = class {
         this.actor.show();
         this._isGreeter = Main.sessionMode.isGreeter;
         this._isLocked = true;
-        if (this._ensureUnlockDialog(true))
-            this._hideLockScreen(false);
+        this._ensureUnlockDialog(true);
     }
 
     _hideLockScreenComplete() {